Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 30 Jan 2012 05:06:59 +0000 (21:06 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 30 Jan 2012 05:06:59 +0000 (21:06 -0800)
commitfacf025cbecb653040e2b828ecfe01a4fa93eba9
tree3ece87dfc07b1e8bcdcd6b187c26001b9c43a9d3
parentb7613b0b4edfa8baf1eb245e2facc4ac10b5e7b3
parent6f3224e9688d78693cd4f3f719d8e8ecd59d112e
Merge from trunk.